File Compare. 3-way File Comparison New! Visual differencing and merging of text files; Flexible editor with syntax highlighting, line numbers and word-wrap; Highlights differences inside lines; Difference pane shows current difference in two vertical panes; Location pane shows map of files compared; Moved lines detection; Folder Compare